You could also 'assume queen until proven otherwise.' eg, if all remaining moves are diagonal, it stays a queen (even if it was really a bishop). And switch to an =K if you see a knight move (or the checkmate requires it to be a knight).