Removed a lot of copy-paste cruft.