Further changes to hide selftest in emit/ML from Moscow ML.