Merge "Some fixes for comments and implied conversions."