Merge "Fix erroneous comment in secdiscard.cpp, plus style fixes."