Cleanup executeBare().
Fix State.h.