SI-8177 tidy up in type reification