(M-05803): Separate C3-405F; fix strokes; unify M005803.