Minor changes to the new decorator / decoratee factories section