refactor(r8): Replace no-line resolution with base entry grouping

refactor(r8): Replace no-line resolution with base entry grouping #344