I was being paranoid and allowing for an upconversion from undefined here, but that really shouldn't happen, so... will fix here and below