Compile fix for gcc (or others where 'and'/'or' are keywords)