Adjust declaration slightly

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Improved flattening

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Better else handling

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
A heap more dead code evaluation

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>