I noticed the pillowed plugs on A, and I also noticed the rounded protruding tongues on B, so then, to quote a wise man:
"Plugs on A
Radiused corners on B
Shorter finger extensions on A
I would soften the frame edges as well"