More tweaks to omnical2npz.py