Merge pull request #311 from MirServer/drive-by-tidy-up

Mark some constructors explicit to avoid unintended conversion construction