- fix copy'n paste errors that got introduced when switching to the shorter boilerplate.
  No object code changes.
12 files changed