expanded definition of “prisoner”