Avoid code duplication in the cuboid code

Boo code dupping
Make cuboid's cu@ optional

We don't /need/ a cu@