Switch relevant Assert calls to throw IllegalStateException rather than IllegalArgumentException

[philwebb]

We have a few areas in the codebase where we call Assert methods that throw an IllegalArgumentException where an IllegalStateException would have been a better choice. Changing them could be considered a breaking change, however, in practice most are not directly caught and there should be limited impact for user applications.