Merge block marker types and phase; raise type threshold from 0.05 to 0.2