Remove "simpl" uses and refactor a BoundedN def

3 jobs for master in 5 minutes and 28 seconds