Fix regressions introduced in 0bf220f9d350ba72e84c2d61c3dd48b452c513cb

The fix for #32 was handling the problem on a wrong level.
The one line conditional + instruction lines should be broken apart in
GetCurrentInstruction()