title/pgolds: code cleanup
title/pgolds: code cleanup


Former-commit-id: da46c87dd6d8322e832dca2d96d70b726b3d5233 [formerly d779fffc93d28bbbfaf1d853bd100853b1d4304b]
Former-commit-id: bd4933887dff01376d08eee0f125017debcb1ab6
torhve/ivar2,torhve/ivar2,torhve/ivar2,haste/ivar2