Cleanups from PR 184

Some cleanups in response to @ametaireau comments in #184 - doing as a separate PR because the other has already been merged.