Address some nits from @zcorpan