Add debug-screening of input parameters to some functions I'd missed