Addressed this reasonably cleanly.