redo r244360 (tighten checks...) after specifying triple