Resync lost changes from Smaug 1.8b

It appears at some point a great many changes from Smaug 1.8b got lost.
They have now been rechecked and replaced as needed. Credit headers have
been updated to reflect this too.