handle definitions and defs equally (brute force)

handle definitions and defs equally (brute force) #2792