Gah. Just noticed that I was already using `uid`. Should we switch it to the `User#id` rather than `User#uid`?