I know this wasn't introduced by you, but i __really__ dislike this. We should aim to clean this up sometime soon.