New branch with a more realistic example hopefully better
demonstrating the core issue.