No issue: minor refactoring
Fixed #1324: Make sure we're not mutating passed options object.