Work-related additions + clean-ups.