Source positions are now tracked correctly.
Formatted.