Cleanup (issue #30): Switch to default assignment rather than hasattr test