Clean up Field typedef resolution