Minor tweak to internal obj factory