WebAPI: Code cleanup.