Tidy up compiler warnings.