Cleanup of previous attempts at incremental fill-angle tracking.