Slightly cleaner and more sensible.
Still thinking.