Minor cleanup concerning issue #77