Improved variable assignment conversion