Execution speed-up (removal of two -mostly useless- modes).