Cleanups in response to review comments and fix turnFrontend test.