Simplify the code a bit b/c we don't care about the nil struct that we throw
away.