Remove and consolidate various uses of reflection.

I'll do this next. Just didn't want this pull request to have too many disparate changes.