Better inline support, slot tracking and code cleanup