Remove if branches, or make optional

[Markus_M]

That subj was being already discussed here https://discuss.kotlinlang.org/t/feature-request-removing-unnecessary-parenthesis/1607