Split APIE enum into its own header to avoid include cycle problems
Rename *_unoccupy to *_vacate
Update some comments