Prepare for next development iteration
Fix whitespace and indentation.
take-drop
Revert last commit
Fix bug and add test for shadowing of optional value with fnk args