Starting with some style concerns; prelude to a rewrite.