A few minor updates to the Sammy definitions. Haven't tried to fix the Sammy tests yet.