DRY up more code (thanks Phil). Update change log.