Improve dictionary access

Some more simple dictionary access improvements.