Whitespace fix in 28.
Simplified additions in 28.