More progress on Autotype command parsing