This needs a None default to work now too.