refs #258: Added typing to all variables (but one inferred by context) to make @mapedorr happy and proud of me! :D