Small tweaks based on @jonmagic's review