More fixes for 'Else'.
Oy vey. This is what sleep deprivation does.
Merge https://github.com/pieman72/adhoc