OK. But then I think we better remove the trigger_error() to avoid the pain of maintaining code for older versions as well as 2.2+. Is that fine by you?