Merge pull request #218 from csmith/master

Fix some nullable annotations in debug plugin.
Minor DCC tidying.