Some nits from @annevk
Merge pull request #842 from jakearchibald/master

Some nits from @annevk