allow for construction by expiry date and for receiver and payer swaptions