[PropertyInfo,TypeInfo] Move static data into scope of its class

This moves the static data members into the scope of their defining
class.

The generated code is unchanged, i.e. no user visible changes.