Merge several fo the attr fixups together.