FLUID-4927: Get rid of nested expander as well as replacing the manual manipulation of the staticEnvironment with the new progressiveEnhancement API.