Remove the cruft from error URL generation (use entryURL path for 0 guess work).
Lots of code cleanup.