Improve circumfix entry a bit.