Cleaning up common swig layout templates