Remove ucfirst utility.  Reorder extend arguments.