Reorganize self-evaluating form rules