What if you want the 40 year period for property put in service before 2018?  The only thing I can see to do is the above but then override the 30 with 40.  Seems to me proseries would know to do this based on the date already entered.