Fixed issues with code line swapping, when lines with multiple statements are involved.