Rearrange ac state.

Notice a minor speed bump of around 2% on runs.  More updates to follow.