Wow, I didn't realize that we were switching on type here before (seems kinda ridiculous to the trouble of creating the `converter` interface and defining two implementations only to not utilize it here...).  Anyhow, nice work refactoring this!  It makes tons more sense in the null converter.