Here's a start on possible improvements to the definition.
Feedback welcome from anyone interested.
Preview | Diff