move some src/tool consistency checks to better locations