Updated to be in sync with my OWL revisions.