Add some things in preparation for the simple refinement.
Merge with silly rename.