SliceLayer: post-rebase fixes, cleanup, etc. (some from changes
suggested by @sguada).