Defer flag callbacks

Followups to #97.