Add Leonardo define, simplify ifdefs