Hi Russell,
Thanks for that - we have actually fixed this properly in the case of hierarchy custom fields (e.g. competency/position/organisation). See add_custom_fields_for() in rb_base_source.php. Each custom field type is properly handed and the appropriate filter is provided.
I've been meaning to port the fixes back to user and course custom fields but haven't got to it yet.
Simon