0.1.1-1r2: Some decls moved.