Minor refactoring WRT offset(s)