Hacking in support to make valid work how I'd expect.