Further wrapper metafunction removal