Splitting Expired state into Expired and Expired when Available. Cleaning some of the TODOs.