Few code cleanups for IntrinsicsResolver