Oops. 

Let's do that as a separate patch?