#63: Clean up MessageConstants