Tightens up formatting in state helpers.