Updated to use _waitRequest as int and not bool

Also fixed a potential bug introduced recently where some operations
that should be volatile were not.
Removed not used overloads