Add schemas code, second attempt.

Just drop the match and use the cases directly as part of the map.