replace 'if' with 'when' or 'unless' where applicable
leave the user's font-lock setting alone