A bit of general maintenance, mainly related to issue #69