Adding position information about function models to generated model. This necessitates naming all function expressions, hence the expected outputs of the test suite have changed a bit.