Completed stuff missing from earlier toothbrush commit/push for ACL2(p).