Making TriggerTree address setting cleaner