Minor cleanup of convolve_cube and npred_demo.py