Remove layer of indirection on pattern active states