Major overhaul of Daikon-related stuff