1.6.fix warnings

The code compiles now with -w Ae and -warn-error A.
Hah, so now I know how you handled this ... you let yourself be inspired by the code from 1.7! (and left it in here as an additional comment)