Significant cleanup of ValidationMixin. WIP on some other bugs and cleanup