Keep unmapped lookup barriers while… — Code review | OneNoughtOne