Minor changes to aid the compiler, nothing more.