Review 28356

C. Thomas Tyler
Corrected custom logic extraction issues found during code review/testing.
Tip: Use n and p to cycle through the changes.