preprocessor cleanup: __xpv