One point to consider is that removing `p` will break backward compatibility.