Normalized "HACK" comment :P
Fixed TODO

That's what DelegatedCollection was invented for ^_^