It's been so long... I'm trying to remember what necessitated going with a default... I'm going to try some manual testing to see where `nil` was creeping in.