reworked term expansion for "boxed" properties, e.g. margin