replace the old fast_variant with the new one
remove redundant namespace closing/opening