ENG-5875-prep apply isObjectType and other minor cleanups