Chop down return and continue paths, refine log entries
Chop down return and continue paths, refine log entries

One statement per line is more convenient to determine test coverage.

OmniLayer/omnicore,OmniLayer/omnicore,OmniLayer/omnicore,OmniLayer/omnicore,OmniLayer/omnicore,OmniLayer/omnicore