Fix retarded assignment to non-existent variables from last commit.