Various cosmetic code changes

Nothing interesting here, except that things have to be cleaned
sometimes...