Better 'core' branch tracking