Address compilation warnings due to 2016-01-03 mml refactoring.