1.13.8.4

(1) Code cleanup (more preparation for 1.13.9).