Facepalm! Sorry, I wanted to clean up the way but clearly was a bit too optimistic. Feel free to revert the changes.