Fix indentation for code after multi-line function signature

Closes gh-15
fix indentation for multi-line if expressions

This fixes a regression introduced by
95c9519fb9e010df8e9aa91d5925a84a1f97d424
remove dead code
add more test cases