CS and docblock fixes

Third of a few pulls to replace #6.
Is it really needed in the `emit` function?