Clean up of HSSFDataFormat. Whilst Bug 22456 was probably not an issue with the previous code, these changes are even better ;-) Squashing Bug 22456 now.