Update m4 files.
Compute shared liberties between blocks.
Misc cleanup.