Change trigger inference to wrap triggers in old() if necessary

Change trigger inference to wrap triggers in old() if necessary #734