Proper hierarchy in tag order
Clarify scoping behavior in defers