And clean up variable ordering (as shown in the handbook) as little.
Caught by: Andreas Klemm <andreas@klemm.gtn.com>