Reformatting some nasty method signatures