Unify and simplify the implementation of Queue.get and Queue.put. Fixes #647 (add a test case for that scenario).