Minor mllib cleanup

See individual commit messages for the changes. @shivaram