Cleanup instrument data properties

This simplifies the property declarations in instrument data a bit.