Fixed a small bug that removed var decls by re-refactoring them.