Comparing #1518 (Version 1) and #1538 (Version 2)

Improved in #1515 but could still be better.

Improved since #1515 but could still be better.