Make zero-extending versions a fixed part of the algo

Make zero-extending versions a fixed part of the algo #40