Making wait_* just wait and return nothing
Updated performance counters to use the standard futures