Handling of N-Path problem

Eiffel Inspector reported a high N-Path, so split the primary feature up
to help eliminate this problem.