Return a FixItHint instead of taking a diagnostic builder

Addressing review comments from r212784.