Seems having this stored twice is bad.  Do we need .parameters?