- More conservative 'expected payment by now' logic
- Code style cleanup