Removal of heuristics again.  Padding top-level though results in best-looking graph yet.