Make disposition changes work again, and start using "_" prefix for
unused arguments
Fixing issues found in pylint, making nonused arguments prefixed with
underscore