Fixing up and copying 'Comparing Goal Types'