Minor interface enhancement (again).