Replaced local VStrut and HStrut with version now available in Sun.