Cleaned up preamble handling.
Fiddling.