MC: Better handling of tricky symbol and section names