The path here must be left over from some earlier draft; fix it.  And do
some more minor cleanup while we're there.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>