More code abstraction to make fix for overrun easier.