Simplify preserve_constants

This is possible because of the fix for dplyr#635.
Reinstate example because of code fix