Adding an assessment handler, some change handler cleanup.