The merging of AspectJ and AspectWerkz