Fix possible overread in marker bit parsing.

Also remove a FIXME that was already fixed earlier.