Given that we already check for locale None above, we might want to do a nested condition for such a case, but not that complicated as Dave suggested earlier. :)