Step: Convert to using a generic internal representation
cellaut: Change the internal representation to Int