Allow wait_for to accept a single value argument (again)