spigots: address comments from queued up reviews

Change-Id: Ie79c2e0733a2176a8b1134418e358e7c64b52b4d
2 files changed