IDN/IPv4, and other misc cleanup