[PATCH 12/28] moveconfig: Correct unused variables