Clean up functions that return a single thing to actually return just a single thing.