Adding missing static instantiations