Misc. cleanup: removed bottom argument from Body and Shell