fix some definition/invocation mismatch madness
sometimes keyerrors are your friend