Took a first step towards obeying object shape definitions.
This is just becoming a pointless distraction. Switched to a depth-buffer based solution that should handle coplanar geometry.
Attempted to add a few more of the primitives. Incorrectly, I suspect.