Some more wrapping to avoid unintentional changes

And especially for them to leak to the outside world.