Really fix NO_INTRA_EMPHASIS this time.