Refactor instrument json encoding.

Now handled in individual instrument classes.

--BRJ and CAR