> Perhaps we should indeed remove these methods since we don't expect invalid entries.

+1