Backport the rest two commits in prestosql/presto#369

[wenleix]

trinodb/trino#369

The first commit is extracted from #12407 . And @findepi adds two clean up commits.

[stale]

This issue has been automatically marked as stale because it has not had any activity in the last 2 years. If you feel that this issue is important, just comment and the stale tag will be removed; otherwise it will be closed in 7 days. This is an attempt to ensure that our open issues remain valuable and relevant so that we can keep track of what needs to be done and prioritize the right things.