WAMP: code rework and other fixes in non-executed error code paths. Should have no side effects.

14 months ago, Edouard Tisserant