Checkpoint commit for style determinator.

Not happy with the factorization, but it's progressing.