Add already tripped check
Removed dead comment
Added and updated already-tripped checks, raised opt level to 3