dice expressions accept anotations

cleaned up the code around accepting optional arguments from die expressions and obstacles. preparing for moving to a more clearly demarkated model for representing tests etc

fixed a bug where annotations were not accepted when exploding or extra success