Merge "No need to check a wp<> for 0 before promote()"