More reformatting, started on 'ObjectNode'(s).