Reworked the initial parser. This does not solve the fingerprint issue, but works more cleanly.