Minor syntactic clean-up and new Argonaut type class instance.