Fully apply David Blaikie suggestion and add comment explaining why.