refs #44: no more kwargs abusing