Convert the fill state of shapes to a computed attribute instead of a stored one.
Make the isFilled computation stricter.
Ignore the XCode user state file.