Just an update.
Closed the loop at CW yesterday for a first time 1 year extension on a non imm O based on marriage.
Was asked if I wanted it to 31st october instead of 26th september (why anyone would chose the former is beyond me). So got stamps for both, I guess due to the amnesty(?)
Everything went smooth, no house visits or anything in the waiting period.