Comments.
Comment formatting.
Comment formatting.
More comment formatting.
Implement another little bit of interpreting the resolve hook return value when it has .extra.