Improve state-macro encapsulation.