Ack! I just followed the previous implementation in this case, but agree Option<> is way better.