Merge "Don't allow int<->pointer conversions."