Merge "Code cleanup possible with new reflected classes."