Remove hack from signature clean-up code; implement the clean-up properly within...