Fix numerous programs to work with contenthandler changes