Shorter initializer.
Fix up variable decls.