Better code analysis of methods to see when they are empty

Fixes #492
Errr because I was debugging with token_name :-) Will change, thanks