Fix outdated code (old tuples syntax)

Partial fix for http://youtrack.jetbrains.com/issue/KT-3775