Implement code changes, per @Ocramius' suggestions