Fixes/cleanup to the 'folder-hook' handling.