Finally! Remove two horrible, nasty, lingering, confusing, hacky calls
in State.