Tighten up the type constraint, to maintain compatablity.