Add more state queries to State::currentState