More EKF cleanup/tweaks.