Refactor disposition unpacking for clarity