FIX: Whitespec in specs changed. We should really figure out a better way of ensuring correctness here.