I think it would be "easier" if PHP-810 is considered from the get-go here.