More goodness to make real compilers happy ...