Fixed the copy-triangle macro, added copy-diagonal.