Minor REFILL refactoring.
Fix bug in SPACES.