Consolidate layer option evaluation to a single place