Some shortcuts for trivial cases in the analysis - should speed things up a little.

Records still not working quite right.