fix const issue with PK callbacks
1. Added more options to the full commit test.
2. Cleanups from static analysis.