Add forgotten `let` to fix startup up
Minor syntactic style changes
Merge branch 'diffoptions'

Closes #49.