You've changed some of these to use `auto` rather than an explicit return type, but then the rest still use explicit types. Can we make them all have a return type to be consistent?