Handle defs with names coinciding with keywords