Housekeeping, stop compiler warnings in 'if' conditionals