Argh, fix compilation errors after my indentation fixes ...