More overdue changes; forgot to commit with last bunch.