Can you add a comment here explaining what this does & when it should happen, so we don't accidentally later reorder things?

Applies at L242 and L525 as well.