Improved label format detection

I realized I was being really silly.