Use tape-parser for tape parsing, and cleanup gross timeout hacks.