Refactor ASaPType so it has a header and an implementation file. Also fix some trivial coding style issues.