gcc is being stupid with if/else constructs
clean out some other warnings
1 file changed