Slight progress and fixes.
Use nullary rules when possible.