improve wrapping and add colours hints

The coloured hints help visualize which part paths of the wrapping code
executed.