NIT: could use more returning.