Use xsystem() to be consistent. Some minor cleanup too.