BUG-1485: switch BuilderTemplate to new range enforcement