mc: Fix variable shadowing warnings