Fewer conditionals to allow Harp to compile