Refactored: moved AspectCalls class into BoundaryAspectGenerator.