DRMP tweaks, add 'Academic' organisation_type. Small optimisation of
inline_component.