Minor updates in base static_variant