Added coroutinification of return statements.  Also cleaned things up a little.
Added coroutinification of return statements.  Also cleaned things up a little.

benjaminy/Charcoal,benjaminy/Charcoal,benjaminy/Charcoal,benjaminy/Charcoal,benjaminy/Charcoal,benjaminy/Charcoal,benjaminy/Charcoal,benjaminy/Charcoal