I should have run Eclipse's formatter over the whole file but I didn't want to risk breaking other formatting conventions, especially relating to line wrapping.