Rewire 404 mechanism. Correct some var bugs resulting from abstraction.
Make var happy when empty.
Manual merge because automatised one didn't actually do anything...