Cleanup overly verbose code.