Upgrading Jetty: Extract local variable; remove review comments.