Fixed issues with if-else- and while primitives, where condition weren't
generated as expressions; now there are.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>