! Redo move topic stuff per comments on #921.

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>