Cleanup C++, plus porting Style editor in progress...