Fix GarbageStayman and in the process make all of stayman more sane