Various updates to support HTT tracking studies. This won't work until atlas/athena!32346 (merged) goes in.