Author: David Hill <dh...@mindcry.org>
Date: 2016-10-18 (Tue, 18 Oct 2016)
Optimize by removing defers
defer's are nice for readability but they do add overhead. This
gets rid of defer's where it is just as easy as not to use one.