Deal with underscores more properly, but I don't yet understand ELPA symbol name semantics