Some more fixes to Stefan's megamerge.