horde: minor cleanups from rawhide