Refactored local push to maximum 80-character width lines
Fixed over-peeling of tags in local add_ref
Fixed local push bugs