Merge "Don't check program selector's type for equality." into pi-dev