Small chores

Extractable parts of the commonjs-port branch and integration of #258