Mechanics - foul on touchdown play

[wisref2]

Just looking for input. A scores a touchdown and B is flagged for a 5-yard facemask. A elects to have it enforced on the kickoff. You give the foul signal and point to the free kick spot - then go on with the PAT.

Now - B fouls on the successful PAT (15 yard facemask) and elects to have it enforced on the ensuing kickoff. So now you have to go back and decline the previous 5-yard facemask.

My thought - after the PAT, you give the 5-yard facemask signal again and decline it. Then you give the 15-yard facemask signal and point to the free kick spot.

If the foul on the PAT is declined, I would give the first signal again and point to the free kick spot, then give the second signal and decline it.

Thoughts from you other whitehats?