Clean up tunnel classes a bit, fix validators.