Refactor dataset metadata and introduce plot metadata.

Introduce plot metadata and currying in drawer.
Also please put a comment or similar to see what's actually being tested.  It's really not obvious what this is checking.