Continuing to refactor / simplify copy-pasted client code. Fixing an issue where things that *should* be the same are in fact *not* the same because of backend code that seems like it wasn't written consistently.