Improve prefix handling.

This now uses .suffix correctly (I believe), and fixes the way samples
53 and 57 are parsed.