Avoid overgeneralized recursion

Per review from Maciek Sakrejda.
Typo

Per review from Maciek Sakrejda
Wordsmith

Per review from Maciek Sakrejda.
Remove environ-get duplicate

Per review from Maciek Sakrejda.
Fix another bad lexical version comparison

Per Maciek Sakrejda.