The constant 4 is sometimes printed as "4L", or "4LL", in CFG dump output, depending on platform; accept all variants. Ammends commit 8f670d5b.