Refactor deferral (:defer) and variable (:variable) processing.