Temporary fix for issue #21 - disabled value guards altogether.
Fixed some bugs which were inadvertent knock-ons from this.