Fixes for bugs in road-paving behaviour, plus some method renames.