Refactor AllCalls and CallsFullyWithin with Helpers and inheritance