Incorporate feedback by @Ocramius