Split/recomment some more asm + hw labels