Subtle changes. Mostly simplification.