Fix inline variables created to help simplify code.