Some cleanup which resulted from trying to see if I could get rid of the
decorator root element restriction.