Significant simplifications. No functional changes.