Ensure that bare attributes with default None are removed too (#556)

Fixes #523
4 files changed