Address code review comments on 89086c3 (see https://github.com/JedWatson/keystone/pull/554#comments)