Misc minor cleanup of custom git logic