MWTP: minor optimisations in some constructors