A little refactor-fu to isolate that instantiator logic