Yes, that's intentional.

Through, I'm not sure if we should introduce these integration constants.  I'll squash stuff using it, if there is no objections against.