Make Wakeable agent somewhat more logical.