Use whitespace_attributes when appropriate, closes #96