Additional simplification, full confirmed coverage and added pragmas.