I haven't stayed at that Marriott in several years, but it was fine when I've been there in the past. However, it's not a very new property, so it's quite possible it's showing its age. You may have also been on a floor that hasn't been renovated. It's most definitely not a converted Courtyard though. It was built as a full service Marriott.

And I second the vote for the new Hilton in Austin -- it's a very nice property.