I need to get validators in so we can avoid this dance pretty much everywhere. When we define validators this is all taken care off.

Not strictly related to this PR or your changes, but mentioning it so it doesn't go away :)