@andymckay I think this reads better, even though it's more verbose. I don't mind using the constant.