Improved internal sanity checking.