Any reason not to let these be handled by the fallbacks? That shouldn't hold up merging this, but it's a good style question for us to decide.