Avoid reinitializing the types twice.
2 files changed