Update ML scripts to accommodate variable columns (futureproofing)

[epbrenner]

Rework how ML scripts handle extra columns -- explicitly specify things that should remain rather than operating by subtraction of a presumed fixed set of columns. This doesn't currently cause issues but could if input data changes upstream.