Minor cleanup/restructuring; trying get/set for Pin.bubble.