Updates needed for the latest version of Sheer

... which stops coercing None to string.