Merge "Clean up obsolete aliases for Truth." into main