Further look input parse fixes! Whee...