Add more helpers and correct existing ones.