Refactoring: support number/boolean extra;
more tests.