Split computed macros into a separate module
Split dependent key management into separate module
Merge pull request #5140 from mmun/computed-cleanup

Computed cleanup