Minor cleanup of the Asm Completion Code