Further improvements to forwarding, moving, etc.
Should have been part of previous commit.