Assorted merge cleanup.
Assorted merge cleanup.

JamesGould123/trailsy,remory08/trailsy,trevorackerman/trailsy,vinh3928/trailsy,trevorackerman/trailsy,mgraesser/trailsy,remory08/trailsy,CodeForBoulder/trailsy,CodeForBoulder/trailsy,JamesGould123/trailsy,vinh3928/trailsy,mgraesser/trailsy,mbarrenecheajr/trailsy,mbarrenecheajr/trailsy