Stragglers that did not make it into last commit. NOW generecizing is complete.