Works for me.  I thought about adding 'None' as a regexp, but it bloats the lookup array as a direct map.  Maybe it's worth some special-casing.