Finished up refactor of non-entity servlet helper.