Some calc cleanup.