Merge "Trivial cleanup of recent changes."