Default to Integer instead of Int, and adjust fromInteger accordingly