Merge changes from JA, minor format cleanup.