Actually, `extract_from_key_value_set` (above) *does* remove the specified keys from the key-value set - see the docstring in `util.py`. It's easy to miss, I know :). Any ideas for a better name?