Undo since it doesn't show line number
Handle more dictionary cases
Handle more dictionary cases
Factor out code