There's a lot of public API in the hydrator that should really go away...