The indentation here looks odd.  (I can always take care of this post-merge -- just want to make sure we don't forget to fix it).