Good suggestion. It'll increase the review burden, but is much cleaner.