WeakPersistent handling: Removed old implementation
WeakPersistent handling: Cosmetics, indentation and no- linting.