Doing a bit of work on input stubby-ness and subsystem.