- a few relationship-safe fixes after merlinofchaos had a look a our code :-)
- a little refactoring to make content_handler_field / content_handler_field_multiple articulation clearer.