Tidied up method call counting a little.