Let's stay with the version implemented by @brackeen for now, I'll put an entry into backlog for a stronger implementation.