Replace save-pict-as-png with save-pict. Fix order of arguments to scale.