Inlined functions that should be

Tiny commit that fixes building from several TUs. We need a test case for this, but I'm not sure how we can do that.