move optional parameters
move optional parameters

optional parameters should be handled in one place directly after
variable definition.

Converted to one-liners.

t-b/igor-unit-testing-framework,t-b/igor-unit-testing-framework