Slightly cleaner attribute handling