Replaced code that relied on a wrong function-alignment assumption with new working code. Renamed policy classes to follow Boost naming conventions.