Additional changes/fixes for BZ#1092188 - Standardise the freeze/snapshot functionality.