Rewrites in light of comments