Review files 000 and 001

[jesyspa]

000: minor revisions to simplify code. 001: significant rework, previous preconditions were too strong (inconsistent).

If there's an easier way to do 001, I'd be curious to see it.