Making define()s more explicit