Unifying Optional Wh-Movement