Use member type in check-type
Remove one FIXME