expressions - refactor function calls into separate compilation unit