Some acl2 refactoring, progress on assertion verification.