Subtle re-factorings.