CPP/W: Small build cleanup