Can't we combine these two into an `Import-Template` directive for `org.aspectj`?