This looks really good. While we're here, can you add an empty-string value?