Address #778 - don't restrict options to Hash/Array types

 * I'm not sure what I was thinking originally, but this obviously
   breaks the use of custom validators.

 * Add a spec for #778 whilst on it.