Rules clarifications, and re-build based on recent trivial format changes.