Comments now correspond to real function calls
Authored by: glorfin 2018-04-07
Parent: [r249]
Child: [r251]
