remove redundant documentation (how did that get there..)
Better catching of missing annotations
oops, @EncodesEvent instead of @HandlesEvent ;p