Add more state as preparation for removal of stateHackMess.
Add unused stubs for tracking parser state.
Parse Layout test 21 correctly.