Indeed, it's sub-optimal. Suggestions welcome.