Fixes suggested by @Flowdalic in
https://github.com/buddycloud/channel-directory/pull/34.