Add "rebuilds" substitution
Better handling of "smart phone" and "smart-phones"