baobab: update to 3.12.1 and cleanup expr