Some more tweaks to ipt-parse.pl