Merge "Add 2 FIXMEs about confusingly named functions"