Sadly, most of the changes in this file are reintegrating changes that can be originally found in #215 .  Still don't understand how those changes were lost, but ... please ignore (as nothing's changed), except as marked below.