Camel headers before the source ones. Also, get rid of an unused variable. svn path=/trunk/; revision=4631