Improve ir formatting somewhat more