Restructured generated aspect to avoid code duplication in aspect generator