I would prefer this to be the default behaviour with an option to record trigless locks. The only workaround I know of is to finish the take and then manually remove the trigless locks.