Get rid of two HAVE_OVERLAY ifdefs