Refactor a little and add commented-out code for single items

We could return user_meta values that have one item as a simple value
rather than an array. Refactored tomake this easy, but it could probably
cause problems further down the line and perhaps complicates things,
so let's leave it to clients to deal with this.