Improved Koen's added expressions  to also scan the class/method name expressions and the parameter expressions