That seems a lot nicer than how I did it. Shame, that I didn't know you meant to change it like this when you commented on the PR.