Better code analysis of methods to see when they are empty

Fixes #492
IMO, you can remove the private method entirely by calling the collaborator in places using it