Cleaned up an experiment. Can add this again when we need it.
Discard state in a finally { } block.
Added some meta-data to the annotation type.