Right, so that sort of shows how much refactoring we can be working on.

One other thing that's wrong that I forgot to mention is that currently options is assumed to be an attrset. It's actually useful (see tsp-hosts) for it to be valid as a direct option.