This should make no difference to current code, but may help defend against future breakages. Closes #10