Small cleanup in frontend.