Looks like we were simultaneously looking at this Mike. I like the suggestion to replace the flags with behaviour controlled by hsmparams.