Merge "Clean up use of get_field"