Add 'inc' and 'one' steps + add some unfinished helpers
Rename 'one' in 'any'