v1.7d

Mostly reformatting and normalization across branch code.