Simpler prettification of names

Moved the prettification of names into a filter on User (as it should
be). What was I thinking when I did all that if-then-else stuff in the
template?!