@stof @Ocramius is that what you had in mind? Is this really cleaner?