got rid of the custom PHP in favor of theme_username() and theme_field(), a more Drupal-ly way.  Keeps logic out of the template files too which is good for readability and performance.