allow for construction by expiry date and for rec / pay swaptions