Better implementation of C-c a (still doesn't work well for function calls)