Add org tag "katie", and move NEXT to after DEFER.
Pull comment to start of newline.