30786 is ICE-on-invalid. 30805 is ICE-on-unspecified. I don't like ICEs but these don't seem like release-blockers to me.
Anyway I attached prototype patches for these. I don't have resources to test them for three weeks, so if anybody can beat me to it...
Paolo
