Drop C-e; improve calc invocation