Add two more matchers;  reorganize things to make way for other java.time matchers.