@meatballhat still feeling that one out, but I agree that it does result in some clarity loss on the `return` statements.  Changed.