webhandler: Clean up a bit.