Changed to make copies by default. Otherwise, just readability updates.