Minor clean-up in splitting and thickening functions.