[COMMIT] Make compiled #'custom-declare-variable forms compatible with 21.4.