Replaced duplicate code with calls to forwardInfo.

Also made move constructor handling safer.