Updates for new move parser.