Change expectation record

Remove arity field, combine M/F/A fields into key field
Use expectation records in hoax_tab