Forge compatibility fix and minor formatting cleanup.