Remove some do syntax
Fix some spec compliance issues and update to new attr storage.