Points for effort separated from points for catching/avoiding. Still
needs clean-up.