Missed from merge

* These commits were missed out when PR #460 was merged instead of PR #458
* Mostly whitespace consistency changes
* Also moved duplicated indented_details() into Address concern