Avoid adding src to the source set when using 'w'. Fixes #119

(Also fix nearby editorial bugs)