These changes were done month ago, and I failed to commit them.
Updates to weak references: disabled.
cleanup.