Fix subpacks.

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Merging from master. Removing Expect class code.