Add special casing for certain elements and whitespace
Pre-v1 release for real-world usage