Revised algorithm. More tests for edge cases

- Fix: NSLog version will correctly add 'leaving' log if final line in
method was a non-tracking NSLog
- Edge case: Added handling for if (whatever) with return on next line,
but without braces. Detection routine relied on braces, so this return
would be missed for an early exit log. New version will add braces.