Simplify layer change code now that we have distinct support layers