consolidated xfl to reduce symbol duplication in global namespace