Enterprise Phone was wrong.  Also, some OCD easing