#310 will still be a problem here because of this, FYI.