Minor revisions for Rules; a quick TODO item for performance.