MXFUnction::expand preserves scheme now