Use a modified KVC that can cope with dots in dictionary keys

An alternative way of fixing #1532