Firebirds minor refactoring.