Fixes from @stof's comments at https://github.com/kriswallsmith/Buzz/pull/129/files#r4716319