Fix make opaque unused variables