Bug 905986 - Refactor adjusting phi types. (r=jandem)